core: Add API to convert csum -> checksum without malloc()

Just doing some profiling, this was in the top malloc() callers.

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 09ce5306035cb3b578128955ca5ec225200930ad..9a90da57108155cbed45b291b9a1fdb2d894efcf 100644 (file)
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -948,23 +948,27 @@ ostree_checksum_to_bytes_v (const char *checksum)
   return ot_gvariant_new_bytearray ((guchar*)result, 32);
 }
 
-char *
-ostree_checksum_from_bytes (const guchar *csum)
+void
+ostree_checksum_inplace_from_bytes (const guchar *csum,
+                                    char         *buf)
 {
   static const gchar hexchars[] = "0123456789abcdef";
-  char *ret;
   guint i, j;
 
-  ret = g_malloc (65);
-  
   for (i = 0, j = 0; i < 32; i++, j += 2)
     {
       guchar byte = csum[i];
-      ret[j] = hexchars[byte >> 4];
-      ret[j+1] = hexchars[byte & 0xF];
+      buf[j] = hexchars[byte >> 4];
+      buf[j+1] = hexchars[byte & 0xF];
     }
-  ret[j] = '\0';
+  buf[j] = '\0';
+}
 
+char *
+ostree_checksum_from_bytes (const guchar *csum)
+{
+  char *ret = g_malloc (65);
+  ostree_checksum_inplace_from_bytes (csum, ret);
   return ret;
 }
 

diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h
index 83f688b1eb9292cd76d18d423a8a4c3f2397fc80..b3f761e84e653770b030d7c052a851795c11d762 100644 (file)
--- a/src/libostree/ostree-core.h
+++ b/src/libostree/ostree-core.h
@@ -113,6 +113,9 @@ GVariant *ostree_checksum_to_bytes_v (const char *checksum);
 char * ostree_checksum_from_bytes (const guchar *bytes);
 char * ostree_checksum_from_bytes_v (GVariant *bytes);
 
+void ostree_checksum_inplace_from_bytes (const guchar *bytes,
+                                         char         *buf);
+
 const guchar *ostree_checksum_bytes_peek (GVariant *bytes);
 
 int ostree_cmp_checksum_bytes (const guchar *a, const guchar *b);

diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c
index 5a95afc8875b65acd8ee051b0443d9133731a806..0fb3a630eece0c234e75bcb31adbde5f8094759c 100644 (file)
--- a/src/libostree/ostree-repo-file.c
+++ b/src/libostree/ostree-repo-file.c
@@ -816,7 +816,7 @@ ostree_repo_file_tree_query_child (OstreeRepoFile  *self,
   ot_lvariant GVariant *tree_child_metadata = NULL;
   ot_lvariant GVariant *content_csum_v = NULL;
   ot_lvariant GVariant *meta_csum_v = NULL;
-  ot_lfree char *tmp_checksum = NULL;
+  char tmp_checksum[65];
   GFileAttributeMatcher *matcher = NULL;
 
   if (!ostree_repo_file_ensure_resolved (self, error))
@@ -833,8 +833,8 @@ ostree_repo_file_tree_query_child (OstreeRepoFile  *self,
   if (n < c)
     {
       g_variant_get_child (files_variant, n, "(&s@ay)", &name, &content_csum_v);
-      g_free (tmp_checksum);
-      tmp_checksum = ostree_checksum_from_bytes_v (content_csum_v);
+      ostree_checksum_inplace_from_bytes (ostree_checksum_bytes_peek (content_csum_v),
+                                          tmp_checksum);
 
       if (!ostree_repo_load_file (self->repo, tmp_checksum, NULL, &ret_info, NULL,
                                   cancellable, error))
@@ -850,8 +850,8 @@ ostree_repo_file_tree_query_child (OstreeRepoFile  *self,
         {
           g_variant_get_child (dirs_variant, n, "(&s@ay@ay)",
                                &name, NULL, &meta_csum_v);
-          g_free (tmp_checksum);
-          tmp_checksum = ostree_checksum_from_bytes_v (meta_csum_v);
+          ostree_checksum_inplace_from_bytes (ostree_checksum_bytes_peek (meta_csum_v),
+                                              tmp_checksum);
 
           if (!query_child_info_dir (self->repo, tmp_checksum,
                                      matcher, flags, &ret_info,